From da6a0bf6d803addab8f903620e43039f5e7f07b3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Dec 2005 17:09:54 +0000 Subject: [PATCH] Use the correct window when synthesizing the key event. (#323077, Sadrul 2005-12-07 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct window when synthesizing the key event. (#323077, Sadrul Habib Chowdhury) (gtk_tree_view_search_key_press_event): Also listen for GDK_ISO_Left_Tab. (#323077, Sadrul Habib Chowdhury) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtktreeview.c | 8 +++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14d35ba8a2..587c4ea867 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-12-07 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct + window when synthesizing the key event. (#323077, + Sadrul Habib Chowdhury) + + (gtk_tree_view_search_key_press_event): Also listen for + GDK_ISO_Left_Tab. (#323077, Sadrul Habib Chowdhury) + * gtk/gtktextview.c (gtk_text_view_preedit_changed_handler): Only scroll if we have focus. (#316310, Paolo Borelli) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 14d35ba8a2..587c4ea867 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-12-07 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct + window when synthesizing the key event. (#323077, + Sadrul Habib Chowdhury) + + (gtk_tree_view_search_key_press_event): Also listen for + GDK_ISO_Left_Tab. (#323077, Sadrul Habib Chowdhury) + * gtk/gtktextview.c (gtk_text_view_preedit_changed_handler): Only scroll if we have focus. (#316310, Paolo Borelli) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 5a2f2d04f1..c9abeabbfd 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4448,7 +4448,7 @@ gtk_tree_view_key_press (GtkWidget *widget, old_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (tree_view->priv->search_entry))); new_event = gdk_event_copy ((GdkEvent *) event); g_object_unref (((GdkEventKey *) new_event)->window); - ((GdkEventKey *) new_event)->window = g_object_ref (tree_view->priv->search_entry->window); + ((GdkEventKey *) new_event)->window = g_object_ref (tree_view->priv->search_window->window); gtk_widget_realize (tree_view->priv->search_window); popup_menu_id = g_signal_connect (tree_view->priv->search_entry, @@ -4464,7 +4464,7 @@ gtk_tree_view_key_press (GtkWidget *widget, /* Send the event to the window. If the preedit_changed signal is emitted * during this event, we will set priv->imcontext_changed */ tree_view->priv->imcontext_changed = FALSE; - retval = gtk_widget_event (tree_view->priv->search_entry, new_event); + retval = gtk_widget_event (tree_view->priv->search_window, new_event); gdk_event_free (new_event); gtk_widget_hide (tree_view->priv->search_window); @@ -12719,7 +12719,9 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, /* close window and cancel the search */ if (event->keyval == GDK_Escape || - event->keyval == GDK_Tab) + event->keyval == GDK_Tab || + event->keyval == GDK_KP_Tab || + event->keyval == GDK_ISO_Left_Tab) { gtk_tree_view_search_dialog_hide (widget, tree_view); return TRUE; -- 2.30.2